Fixes for QA