Minor changes to templated + utilities