Fix timer related.