[z2110] Fixup problems with recent teleportation changes

(based on commit [12158] - 57884bc)

(based on commit [s1732] - a837a27)