more bug fixes necessitated by failures in newly converted unit-tests