Fix child template naming bug, and a couple of small enhancements