fix a few desktop scenarios