Updates to reflect recent changes in Bolt core