Fixed problems introduced by merge.