More fixes.
Merge branch 'desktop'