Minor interface related improvements