Another round of fixing problems in pickling