Fix errors cause of feature flagging