Fix issues with all challenges. Again, it was lost in the merge.

Fix issues with all challenges. Again, it was lost in the merge.