Two minor fixups to make it build.