Tweaks to Makefile and Dockerfile