Dockerfile: some improvements