Two more minor ndb defect fixes.
Two more minor ndb defect fixes.

Review URL: https://codereview.appspot.com/98300043

nicko96/Chrome-Infra,nicko96/Chrome-Infra,nicko96/Chrome-Infra,nicko96/Chrome-Infra,nicko96/Chrome-Infra