Fix bugs with remote srv