Various timer fixes