Fixing berkshelf issues