Fix compilation with stricter C++ compilers
Whitespace fixes