Cleanup some lint warnings