Fix more lint warnings