1812326-6
Further fixes for 3.x compat.