More improvements to release mechanism
Improve version upgrade code