Fix some implementational mistakes in the remote module