NaCl runtime fixes