Port better to C++ platforms