Template fixes
Cleanup