Granularity fixes.