Update code issues with c++ static visibility fix