Beef up version number supported

JAVA-276 #fixes