A pair of old bugs patched

One of these was fixed before, and unfixed by the bay merge.