Bug fixes for single path tracking