Tweaks RE: Pippin