Add package resolutions
Fix issue with templates in demo