Fix SCM patch, fix teleportation. Again.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>