Fix linting errors

Merged Ryan Harg requested to merge fix-linting-errors into develop

Merge request reports