Fix some compiler errors that show up on other compilers

Change-Id: Ic65052eb115762fdf11b915d51f0f80dc72385a7
Merge topic 'fix_compiler_errors' into master

4dd3ac00 Fix some compiler errors that show up on other compilers