Fixing dependency bugs.