Re-fix clang fixes so that it works on other compilers too