Fixes for Template and Project Integration