Fixes so this works with Ohai7, again