Contains fixes to be accepted into WDT JSDT stream