Fix changes from last merge.