Bug fixes, mostly UI.