Fixes for things picked up by clang compilation