Working more on compatibility issues