Sprint 2 - Emergency Fixes