More Dockerfile mods.