Backwards compatibility fixes.