Spawn fixes