Fixed bug with undefined templates
Improved compatibility with rocksolid-columns