Update manage.py and Makefile