Some fixes for path tracking..