Template fixes, export recreating