Fixes for current lodash version