Fixes in challenges and games