NSCommon fixes
Restore build script