Backwards-compatibility fixes and rat