Fix bug with DB saving and async imports