Fix more package references