Correct DB definition
Setup fixes