DB migration + fixed