Reordering migrations & fixing minor bugs.