fix warnings from Clang 3.4

Reviewer: trivial