Fix estimate and BM reports