Fixing dependency chains.