Fix after game module refactor