Make Granite compile with latest Sponge