New Catch build fixes compilation errors