Fixes clang issues