Resolved packaging issues