Teleportation fixes