Files copying - fixes