fixes while integrating with CDF