Bugfixes in Fitting