Fix issues with RC7.
2.0.1