Fixing up dependencies and lint issues