Minor Dockerfile improvements