Fixes for template pages