Core/BG: Correct DBC data and workaround annotation