Minor fixes and tracking tests.