Fixes for Granite