Minor changes to teleport mixin