More spawn fixes