Fixes for CDF-238 and CDF-242