Patches to fix "template missing" startup failure.