Build fixes for NaCl