More Dockerfile tweaks