More fixes for compatibility