x-browser fixes
More xbrowser fixes