Fix build break caused by BlockInfo refactor