Trivial fixes

Clang does not compile this