Fixed #23148 -- A few tutorial tweaks