Fix Teleport Issues