NaCl GC improvements