Worked around some issues in the new chef version