qa fixes etc