Fix compiler format warnings
Fix more warnings