Fixed new warnings from both Clang and G++.