Minor fixes to hide generator warnings.