fixes and docker client