Adjust for latest L4 changes