Fix some minor packaging issues.