Regression and DesktopHeader fixes