Fix silly timer bugs