Fix more lint in code