Tweak buffer presence checks