A few more fixes for the removal of the distributor from the Core