Fix up cross world teleporting