Client QA tweaks