Patches to correct template error.