Added some checks for the OS