Update for newer Docker