Fixing up some lint errors