Fix version_ok
Fix the availability macros