Fixes to framework and estimator init