Minor interface improvements.