Fixed backwards-compatibility issues.