Minor interface changes.