Dockerfile improvements.