more qa fixes