Fxing some clang issues