More Makefile grid gen fixes