Fix more VFormat issues