Clean up package dependency generation. Fix package loading report.