Fix some remote issues