- some lint warnings fix