various fixups to build