Patches to fix over-zealous ploop.