One bug fix, some debug changes and other inconsequential changes just to reduce the diff between the 2 copies a bit.