Fix latest issues with cookbook dependencies