a couple of usibility fixes