More improvements to multiple/missing versions