Fixes for clang compile errors