Tweaked warning suppression