Build fixups