Fixed spawner issues