Cleanup some lint warnings/errors