Arghh, another Fix of DB mistakes

Change-Id: I48fd6e922c23f45aeba3b0ea2439fc07b34c5aa2