Minor user support fixes