Fixed some errors in remote dispatcher