Fixed some issues with string format