Fix compiler errors after merge.