Fix assert  + tracker buttons