Things are now working slightly better on osx