Fix a number of usability bugs