Minor changes for compilation warnings in clang