More work towards standardizing NaCl build