Clang compile fixes

Conflicts:
	CMakeLists.txt