Dockerfile: Additional improvements