Various simple string formatting fixes