Next set of build fixes for Linux. Builds using gyp.