Fix package import issues.