Minor changes to allow compilation with clang

Very small changes which arise due to different interpretations of gcc and clang what sane C++ code is.