Tweaks to stop switch user stuff being upper-cased.