Fixed some game breaking bugs