Fixes for Exercises

Corrected the damage from a merge