More API consistent fix.