Fix some errors caused by merge.