Two small errors during the merge of pull and push.