Final updates to Dockerfile.