Fixing dependency issues