Fixed clang 3.5,3.6 incompatibilities