More bugfixes for Docker.