Fix status-and-diag after BP migration