Fix version number glitches.

This commit will be consolidated into another before merging to master.
Fix glitches in update_version.

This commit will be consolidated into another before merging to master.