Minor fixes for desktop