bugfixes for desktop
bugfixes for desktop