Add missing bits to Makefile and requirements.txt