Granite tweaks