Some cleanups, towards support of 2.11.0-RC1