Review comments fixup, OSX support