Fixing minor SCRUM issues