Seems to get rid of the errors from last merge.