Small fixes when it comes to teleporting