version management fixes/improvements