Backwards compatibility fixes