Fixing up lint erors and deps