a fixed a few more breaks from the P.app change