Fix valid errors triggered by clang-3.4