Upgrade to 2.0 + Multiple fixes