Corrections for different environments compatibility