Fixed some serious packaging issues.