A couple imports were still needed to support Charles' changes to how templates are set up.