Fixing up dependencies