fixups for warehouse deploy