Misc changes after API change.