more track rendering fixes