Minor Docker Fixes

Fix some minor issues in the Docker driver
[minor] Intentional change?