Fix errors introduced in merge of approve branch