Fixed issues with db after db reset