Chef 11 fixes

some fixes, i think these were broken on the rebase