Minor interface changes