Various bugfixes since UI 2.0