Fix more string formats