Fix some packaging errors