Fixed more warnings reported by clang compiler