Regression fixes for 2.066.0-b4