QA Fixes
QA issues