Fix today flagging bugs