some adjustments for compatibility