Update to trunk 9962
Fix for compilation errors