Various stuff.
Brought in changes from work-desktop.