Fix lint issues to build on jenkins