Fixed string format issues