Regression fixes for 2.2.30