Fix various minor issues

Created by: nshahquinn

It will be easier to review this commit-by-commit instead of reviewing all the changes at once.

When merging, we should not squash these all together since they deal with various separate issues.

Merge request reports

Loading