more migrations, fixed some sizes (we don't know that we're in 64bit mode