Finish spawn around saved location support