Fix compilation issues for clang