Bug fixes at cost computations.