fix up grants, time_zone, cleanup after finishing