fixing some Dockerfile builder bugs