fix some other issue of sonar