Fixed packaging issues.