Tried to fix db issues