Fixes some packaging issues.