Template fixes, various