Fixed Sprint 2 issues