Updates for QA fixes