Fixing a few more package cycles.