Small fixes for NaCl build