Fix minor issues identified by clang-700.0.72