few fixes with spawns