More fixes for CDF.