fix packaging problems.