Fix: QA Issues