Fixes for field templates
Fixes for field templates