Fix DB migration and tentative datapath