Fix positions and add missing spawns (cherry picked from commit 14cf9c3fba7d209f82f2588babd7c80178254017)