Fixed few lint warnings