-Fix migration to use block guid instead of id