Clang compile fixes