fix grants and schematool