Package uploads: fixing some bugs