fix two bugs with docker, Bug #1237581