More back-compatibility fixes