Sprint 16, Issue 11: More fixes.