Hi,

For the folk process, it's important to keep those errors in. That might sound curious, but people are unlikely to tinker with an understandable text. It's only the inconsistencies in the song, of which yours are two of the more obvious, that will make people look for better words. Some may find more original ones, others may find better new ones. Eventually, the new ones may improve on the original. Thus the errors may eventually improve the song.

Bye,
                                                                  Mysha