Minor patches

For newer versions of docker and for when the container doesn't have `su` in the local `PATH`