Fixing warnings from merged code