Fixed packaging issues