Patches to correct template syncing.