Fix Teleport issues