Minor tweaks to Guide Step template for issue #6911