trivial: Fix up 3 little buglets spotted by clang