misc fixes to nacl