A few changes inspired by lxc-docker-nightly