Fix a couple more version checks I missed and some think-os