Committed for Phase 3 Bug Fixes