Adjustments to teleport