Small PiP changes