timer fixes