Undid some fixes in Makefile from d3a5df4b9