Fix some references so that they point to the Grant instance