Updating compat for v4.0