fix some errors and move it to multi-machine only