Fix #1184
Teleport improvements and fixes