fixes template rendering and other smaller fixes

refs #21457