Tweaks to Dockerfile