Punyify some more echoes