Compatibility improvements with merged version