more fixes to make desktop work