Last fix ups for OSX