Re: More C++ compilability