Small fixes for the Makefile and setup.