Sprint 4 defect fixes