Some p4 changes