OSX support, needs some feature tests