Fixing some merge conflicts with v.2.0.0