Using network path where appropriate

~none