Fix for missing packages after the new refactoring.