Fixed compiling errors with clang
Merge branch 'clang' of https://github.com/cizra/7kaa into cizra-clang