Fix model version detection (not right for 1.8) - finish up 1.8 blocks