Fixup build warnings and add missing file.