Small updates for our Makefile and setup.py