Fixing up lint issues