Improve Leap shuttle when using API (OS X).