timer state fixes