String and formatting fixes