Fixed a few packaging issues