Further formatting changes on OSX