Corrected errors introduced by manual merge.