Some templates and fixes.