Tentative additions for OS X