Fixed timer issues and timer persistence issues