More interface refinements.