Some timer fixes