Clean up some lint errors