More bug fixes. All of the "quick" tests pass. The full test suite still

shows problems. (CVS 2665)

FossilOrigin-Name: a1b6d910cdbb53f12366402d9585dce2aad3ba3d