Minor interface modifications.