More changes for chef11/10 compatibility