Fixing some clang issues