Fix spawner + Include more errors