Further tweaks to Dockerfiles.