Fix more packaging problems so install in 3.2.0 possible