Bug fixes for some versions

Spot checked and adjusted versions.

More will need to be done.