fixes for Teleport Command