Fix chef 11 warnings and some foodcritic warnings