Minor packaging script fixes