Minor fixes. Work on Versions.