Made some more package adjustments