Fixing Custom Spawns