Fix more nits