Fixes for when using bind mounts.

Fixes for when using bind mounts.