fixes for qa