Fixup version detection for 1.8