Few linux/clang compilations fixes