More fixes for backwards-compatibility violations