Inter-packages dependencies fixes (fferland).