Upgrate underscore to 1.6. Fix build