Working on fixing disable-gpu for OSX