More packaging problem fixes re installing into 3.2.0.