Some fixes to the Edit Pickup2.