Tweaks to Dockerfile and Makefile