Fixed errors after merge.