bugfixes (lodash changes, other)