Corrected errors generated by previous merge.