Compatibility fixes for FOX-1.7.50