+Various bugfixes in Desktop support