More Fixes for XXX template.