Fix some lint warnings in htools code