Minor interface tweaks