Compatibility fixes for 2.3RC