Last Sprint 3 fixes