Pull over a couple changes that ended up on the debug branch.  Incomplete mini steps on a couple fronts.