Fix game bugs