Fixes for new QA
Release