Fix spawn ordering