More p3 compat issues