Some slight interface tweaks