Updates for QA fixes after handoff