Compatibility fixes with 2.3RC