Teleport improvements