Various small (mostly usability) improvements