Fix entry/table counters, correct timers