Various changes to support PPP