A couple of 2.2->2.3rc1 quirks