Some last improvements for Mac