Updated grant issuance checks