Porting changes to desktop.