more db fixxes