fix several issues on docker slave mode