Docker client - fixes 64

Fixes #64.

Part of #608, followup is #712.