more osx 'fixes'