some changes for clang (currently not on windows)