Fixing core/common templates not being copied