Minor path detection fixes.