Fix problems related to from dirs being remote