Attempt to correct clang compilation errors