Small fixes for clang 3.5