back-compatibility fixes