Fixed problems caused by previous merge.