Missing "and" and a missing override

Merged Jørgen Lind requested to merge jorgen.lind/compiler_warnings into master

Merge request reports