Fix some bugs on grantee