Quick fixes for desktop