Regression fixes

There is only more issue left to fix which I encountered yesterday. Meanwhile please review.