Minor fixes that clang warns aonut