Flow-on changes from Berkshelf change-over