Small changes for OSX compatability.