Dockerfile tweaks for builers