Fix errors in  Estimator class