Minor user experience improvements