Remove some more warning messages