OSX Support continued