fixups for qa after build changes