qa fixes etc 2