Last changes to get the shell working on desktop