Fixes for bad diff merge.