Small teleport changes