Interim checkin, fixing bugs.  About to do a global API change.