Small fixes

Review old challenges and make some fixes