Fixing errors introduced by the merge of master.