Fix some more stupid pantry crap