Hopefully fixed timer problems