More fixes and data model stuff...
Now plugin UIs can be shown again...