Fix some mistakes in the remote module