tweaks for clang
fix for gcc