Makefile update

Let's test with two more flags
Start of V18.