More changes to fix syntax error found by clang