Fix start game bugs