Fixing up the exercises