Fixed additional DB -> NDB changes