More tweaking for Dockerfile