A few smaller usability improvements