adding non-mac specific checks