Added a few API fallbacks.