Fix inherited resources and templates