DF Some fixes in cost calculation.