Backward-compatibility fixes.