Fixes from rearranging templates/includes