Makefile has less GNU + one little bugfix