Remove some undef  warnings