fixes for Linux
fixes for Clang