(OSD BRANCH) Compile fix (nw)