Fixing up some packaging issues