version-handling fixes

From Wiktor