Sprint 2 Bug fixes