Fix NaCL (maybe it should be removed?)