Fixing more lint errors