Changes for OSX and rust.