Fix some more bugs with string.format