Some modifications to make plethy ready for R-devel