Minor interface fixes