Fixing return values so old db tests pass.