Use lodash instead of underscore, fix references