P31XX and P51XX updates