Make changes proposed by Docker devs