Fix-up string

These are some additional works to 8464cac63cce8.