OMP fix and Makefile update.