Fixing broken templates from wprzyb/patch-*