Fix strings reported by yahoe.001