Fix tracking code bugs

Sitting at 1.3.4