Fixed some outstanding lint errors