Fixes for grant system