Various build fixups