Fixes to CDF generation and intersection.