Changes as proposed by Docker devs