Microtemplate fixes

+1