Compatibility fixes for 2.3/2.4 (remove deprecated classes/methods)
Another compatibility fix (2.3 vs 2.4)