Fix several small usability issues