String formatting fixes