merge fixes from dispatcher/Docker file

it seems that these changes help with #191