QA Round 1 fixes