last few qa fixes