Fix lint warnings #4