More updates to Dockerfile