Several changes to adapt the desktop application.