API change fixes.