Small changes to flagging.