More string formatting fixes