Updates for use with OSX