More changes to b-core. Nothing earth-shattering yet!