more fiddling with core bundle building