Minor Docker Fixes

Fix some minor issues in the Docker driver
Nope, it looks like the ripple effect of changes is too big, particularly since its only Docker that can ever have an image (container) that you cannot log into. I think it's safer to leave the magic value here, but perhaps document the Docker class explaining what it means?