Fix a few more compiler warnings (from Clang mostly).