Defect Fixes for Sprint 4