Fixed timer issues.