Fix warnings from merged code.