Fix two errors with clang 3.6.