Fixes temporary for QA testing