Some bugs in collecting exercises fixed