Defect Fixes for Sprint 5