Fix another problem from the merge
Fix more problems from the merge.