Try to get some more pure warnings squashed