Makefile fixes after merge