Adds missing Makefile for NACL test and a couple of smaller fixes