Compatibility changes fix