Updates for QA issues