Added OS X checks