Fixed Sprint 7 issues