(OSD BRANCH) compile fix (nw)