Correct 1 other bug. The SSD tracking now seems to work OK