V0.9: Back port fixes for putting modpath delays and delay calculations