fix the restore architecture and block mapping