Update for clang error and Makefile cleanups