Some player and enemy fixes