Automatic upgrade to 2.0
strict compatibility fixes
minor fixes