Fixed OS version checkings