Untested fixes for Docker invocation.