Rollback and fixes to puzzles