Make import and package fixes.