Fixes for current OSX.