migration order matters + small fixes