Minor Docker Fixes

Fix some minor issues in the Docker driver
Hmm Optional is probably better than -1 these days. Or NoSuchElementException