Fixing several clang compile errors.