Fix some CLANG complaints.