update latest db and fix derp

Change-Id: I5b96d6e194047567fa923b6e9141d62b8462840b