Fixing dependency problems