Fixes for Sprint 2