Fixed errors introduced by previous merge.