Grammar and makefile fixes