[master] More work on compatibility issues