fixes to persist timer handling