Patches to fix template system cutting off part of a path...