Patches to ensure ploop isn't a problem.