Fixing issues related to the desktop source code