Core/BG: Corrections to cf5058c4e3ef5a5b736d22a7faa5ee1e8bf8035d