Additional bug fixes for "/gate tp" commands