Tweaking teleport behaviour