Themaister Fixup build for latest Granite.