Fix bugs on game management