Misc fixes to berkshelf method