Fix up a couple of compilation issues