Some package fixes