Fixing Chef11 issues