Fix some package issues.