Fix bugs with remote