Phase 1 fixes