Improve logs and db upgrade
2 files changed