First osx compat commit