More DB fix yay