Upgrade to 2.0.1 issues