Minor fixes for short range teleport