migration and fixes.