IBT: fixes allow C++ compilation