Fix more style bugs