Regression fixes for changes since 1.13