Small fixes and formatting

Merge request reports