Fix more warnings and some style.