minor build fixups