C++ offsets fix.