Improve handling of multiple/missing versions