Fix the database and database_grant deprecation warnings.