Fixed incompatibilities with 2.0-release