made fixes to template inclusion issues