Minor interface fixes.