Fixing links and dependencies.