Fixed exercise issues